bitkeeper revision 1.1181 (420ca996keP3Po6VzQplsJpxQ7eTyg)

Not sure why BK didn't pick this up last time...

diff --git a/.rootkeys b/.rootkeys
index 6d1496d0d6cddfe46f5759548dcfb82a4060a006..f334b55cfc24e0c208689933a9d385b9145b89b3 100644 (file)
--- a/.rootkeys
+++ b/.rootkeys
@@ -923,7 +923,7 @@
 41f97ef5139vN42cOYHfX_Ac8WOOjA xen/arch/x86/vmx_platform.c
 41c0c4128URE0dxcO15JME_MuKBPfg xen/arch/x86/vmx_vmcs.c
 419cbedeQDg8IrO3izo3o5rQNlo0kQ xen/arch/x86/x86_32/asm-offsets.c
-4107c15e_NqNYew2EXroXz2mgTAMWQ xen/arch/x86/x86_32/cdb_trap.S
+4107c15e_NqNYew2EXroXz2mgTAMWQ xen/arch/x86/x86_32/call_with_regs.S
 4202391dkvdTZ8GhWXe3Gqf9EOgWXg xen/arch/x86/x86_32/domain_build.c
 3e32af9aRnYGl4GMOaDKp7JdfhOGhg xen/arch/x86/x86_32/domain_page.c
 3ddb79bcecupHj56ZbTa3B0FxDowMg xen/arch/x86/x86_32/entry.S

diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index 7513fec78ddba63c98449cc3648117997ec9bb07..0281991c0d39b54f1ca37484240643294e2b6019 100644 (file)
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -13,7 +13,6 @@ endif
 
 ifneq ($(crash_debug),y)
 OBJS := $(patsubst cdb%.o,,$(OBJS))
-OBJS := $(patsubst $(TARGET_SUBARCH)/cdb%.o,,$(OBJS))
 endif
 
 default: $(TARGET)

diff --git a/xen/arch/x86/cdb.c b/xen/arch/x86/cdb.c
index 5a3d3e2188c9a20fd983001a96ca1043b6e6f4e5..458e2d64ed023b774e5c593e74c8cc4187238733 100644 (file)
--- a/xen/arch/x86/cdb.c
+++ b/xen/arch/x86/cdb.c
@@ -317,7 +317,7 @@ xdb_ctx = {
        serhnd : -1
 };
 
-void
+int
 __trap_to_cdb(struct xen_regs *regs)
 {
        int resume = 0;

diff --git a/xen/arch/x86/x86_32/call_with_regs.S b/xen/arch/x86/x86_32/call_with_regs.S
new file mode 100644 (file)
index 0000000..71b5b73
--- /dev/null
+++ b/xen/arch/x86/x86_32/call_with_regs.S
@@ -0,0 +1,36 @@
+.global call_with_registers
+
+#include <asm/asm-offsets.h>
+
+       // int call_with_registers(void (*f)(struct xen_regs *r)) ->
+       // build a xen_regs structure, and then call f with that.
+call_with_registers:
+       pushf
+       subl $XREGS_user_sizeof, %esp
+       movl %ebx, XREGS_ebx(%esp)
+       movl %ecx, XREGS_ecx(%esp)
+       movl %edx, XREGS_edx(%esp)
+       movl %esi, XREGS_esi(%esp)
+       movl %edi, XREGS_edi(%esp)
+       movl %ebp, XREGS_ebp(%esp)
+       movl %eax, XREGS_eax(%esp)
+       movw $0, XREGS_error_code(%esp)
+       movw $0, XREGS_entry_vector(%esp)
+       movl XREGS_user_sizeof+4(%esp), %eax
+       movl %eax, XREGS_eip(%esp)
+       movl %cs, XREGS_cs(%esp)
+       movl XREGS_user_sizeof(%esp), %eax
+       movl %eax, XREGS_eflags(%esp)
+       movl %esp, XREGS_esp(%esp)
+       addl $XREGS_user_sizeof+4, XREGS_esp(%esp)
+       movl %ss, XREGS_ss(%esp)
+       movl %es, XREGS_es(%esp)
+       movl %ds, XREGS_ds(%esp)
+       movl %fs, XREGS_fs(%esp)
+       movl %gs, XREGS_gs(%esp)
+
+       movl XREGS_user_sizeof+8(%esp), %eax
+       pushl %esp
+       call *%eax
+       add $XREGS_user_sizeof + 8, %esp
+       ret

diff --git a/xen/arch/x86/x86_32/cdb_trap.S b/xen/arch/x86/x86_32/cdb_trap.S
deleted file mode 100644 (file)
index 71b5b73..0000000
--- a/xen/arch/x86/x86_32/cdb_trap.S
+++ /dev/null
@@ -1,36 +0,0 @@
-.global call_with_registers
-
-#include <asm/asm-offsets.h>
-
-       // int call_with_registers(void (*f)(struct xen_regs *r)) ->
-       // build a xen_regs structure, and then call f with that.
-call_with_registers:
-       pushf
-       subl $XREGS_user_sizeof, %esp
-       movl %ebx, XREGS_ebx(%esp)
-       movl %ecx, XREGS_ecx(%esp)
-       movl %edx, XREGS_edx(%esp)
-       movl %esi, XREGS_esi(%esp)
-       movl %edi, XREGS_edi(%esp)
-       movl %ebp, XREGS_ebp(%esp)
-       movl %eax, XREGS_eax(%esp)
-       movw $0, XREGS_error_code(%esp)
-       movw $0, XREGS_entry_vector(%esp)
-       movl XREGS_user_sizeof+4(%esp), %eax
-       movl %eax, XREGS_eip(%esp)
-       movl %cs, XREGS_cs(%esp)
-       movl XREGS_user_sizeof(%esp), %eax
-       movl %eax, XREGS_eflags(%esp)
-       movl %esp, XREGS_esp(%esp)
-       addl $XREGS_user_sizeof+4, XREGS_esp(%esp)
-       movl %ss, XREGS_ss(%esp)
-       movl %es, XREGS_es(%esp)
-       movl %ds, XREGS_ds(%esp)
-       movl %fs, XREGS_fs(%esp)
-       movl %gs, XREGS_gs(%esp)
-
-       movl XREGS_user_sizeof+8(%esp), %eax
-       pushl %esp
-       call *%eax
-       add $XREGS_user_sizeof + 8, %esp
-       ret